Fix for #175