bug proofing

bug proofing