Should fix #1167