Trying to solve pull-request problem 1_0_1