Fix for #187