Work with 1.1.2