Made compatible with v5.1