working on a mogration issue