Fix for #177