Fix issue with Zap Durations