Fix for working with 2.3.3