missing fix for #1008 / #1236