[1648] Not a perfect solution