and yet another bug fixed! :)