Reflect changes made in 1.1.5