Fixed issue #253