Fix issue 259