this should fix #40