Fixed support for Version 1.1.x