One more fix for 0.8.X