Solution implemented, but a bug remains