Used more appropriate return value