Should fix #1124