Fixed an issue exposed by upgrading to 1.1.5