BOOL return fix