Fix issue 45