this should fix #381