another fix for passenger mode