fixed JASSIST-216