Fix crash with version 2.2.4