force stop - fix bug#915587

[merge]