fix to don't cloak twice