Compensate for commented out sets once and for all