Should fix #1555