fixed JASSIST-230