Get rid of assumption on timestamp length. Should fix #1