backwards compatibility fix for 1.9.3 and 2.0.0