Consistent message ordering - fixes 126

Fixes #126.
:sunglasses: nothing to see here, move along