Fixed return statements.