Fix for hours/minutes?