Fix issue 181