Fix issue 154