Should fix #1404