Fixed 2.0 build