Fix issue 29, 25