one more bug fix for this issue