Fixes running status issue