fix for isse #67