Fixed issue #296