Fix to pass tests