Fixed return value to follow API