committing MAC timestamp fix