bug fix ISTM