yet another bug fixed