Last minute fix for 0.1.7