This should fix #1705