Fix for 0.1.38