Fixed return statements