fiexed JASSIST-238