should be a fix for #165