Note back compatibility break