Bugfix/fingerprint timestamps

This should resolve #1572