Added the hack fix switch.