Fixing JAGGERY-356