Fixed issue #228