ticket: 5 Migration fixed