should fix #222