FIXED ERRORS