Solution fix (Klassendiagram included)