should fix #1291