Yet another bug fixed.