Fix nasty problem logic.