Fixed solutions for 2.2 and 2.4 (was incorrect...)