- Fixed issue #326