Fixed issue with duration in state