fix for issue #59 #67