Fixed Bug 6620 - Cannot properly remove item from current solution

Applied suggestions