Trying to solve #25