Fixed solution 1