fixed JASSIST-206