Fix issue #302