Fix issue #418 - timestamps always returned.