fixing brady's bugs