Use passenger fix from Mahaswami