Fixed ids [MJ-708]

All tests pass.