Fix issue 152