Migration Bug fix