Fix issue 263