Fixed the last fix of the return statement