Fix issue 56