Fixed Errors #3