should fix #1208