Fixing JAGGERY-395