Support for version 1.11.4