fixed up code to run on 1.9.3 and 2.0.0