Fixing worm issues