should fix #21