Fix issue 44