should fix #11