fixed for upgrade