Fixing bug due to the Jaggery change