#1228 Spoon upgrade still not working properly