Updating to 1.5 is a pain in the ass