Trying to solve the #119