Made compatible with 2.11 and newer