Make cloaks work properly!