Fixing stable timestamps
Closes #172