Updated to work with with v7.2.1