this should fix #26