issues #67 and #68 added