fixing issues reference commit #3580003ae33e4a22ab9145b367921387c4d1b98a