Fix for TIM-572

TIM-572

@stephensanchez