timestamp handling missing, closes #46