Fixed the return values to specification.