Fix for #1167