fix and part of upgrade