Final fix for last bug.