Fixes running status issue
Second fix for running status issue
Fixes #1305