Fix for #165