fix upgrade issue #23