Fix support for 1.9.3