Fix 44
Solved 58