fixed JASSIST-211