refactor fix for #67