Fixed issue #334