Fix Bug #1167550