Lack of response when quering duration caused the code to crash.
Merge remote-tracking branch 'remap/master'