Re #7327 Handles times better