Fix for 0.8.0beta2