fixes bug 1043681 but for real this time, tho