april commit re attempt fix solution 1