fixed solution 1