Fixed return code again