Fix issue 19