should fix #1114