Solved problem #141
Solved problem 169