Fixed issue #298