Fixed to pass tests