Fix in compliance with 2.1.1