Modified the problem function disabling behaviour to be less hackish.