Fixed passenger class/object issue