Fix issue #284