Fix: Last minute variable change fail.