Fix for some broken logic.