changes made to work with 1.1.5