Fix support to 1.9.3