Fix issue 271