Keep  version <=1.1.1 compatibility