Fixed broken ordering of steps when PORT is specified.