Fix issue 141