Fixes running status issue
Merge pull request #1306 from emmanuel-keller/1.5

Fixes running status issue