Once more, nasty upgrade bug