Fix MMS timestamp calculation

Closes #334