v4 - fixed two issue #1152 and #687 #1163

Closed dolauli closed 1 year ago