Consistent message ordering - fixes 126

Fixes #126.