This should fix the ownership issues for passenger