Fix issue #273