Fix replay loop bug

Thomas Lakerequested to merge
(removed):upstream into master

Merge request reports