Fixed return value hell.