Fix issue 1.1.2