Added back changes from v1.0.1.1