49aa683 fix ##282 and #158