Adding compatibility with 1.9.3