Fix Solution #1