For #6 fixed calls to old method name