Fixed solution
Solution fix
Merge fix