fix issue #294 #295

Closed kvesik closed 4 months ago