Fix issue 28