Fixed issue where ignored timestamps were not being ignored.
Small code refactoring