Fixing stand-still state