--HR-394 Handle upgrade bug