Fix to work with v11