this should fix #1