Support for 1.1.4 lib