Fix for essentials