Resolve issue for timestamp plugin