cloaked bugfixes