added backwards compatibility with 1.9.3