Fix issue 203