Jeh modal bug fix