simplifications - port fix