Fix for 2.0