Fix: messages imported in wrong order