Fix issues #22: solution leak