Yet yet another bug fixed.