Second fix for running status issue
Merge pull request #1307 from emmanuel-keller/1.5

Second fix for running status issue