Fix issue 50