Fix issue #260