Fix timestamps on modal windows
Merge pull request #67 from asebastian/fix-timestamps

Fix timestamps on modal windows