Fix timestamp segfault

**Note:** This builds on top of #210