should fix #1