fixed JASSIST-195
fixed JASSIST-195