Fix issue #253