Fix for #167