Fix *stop problem, but no effect to old projects