Fix for 1.0