Fixed fields not being inherited to code move