- Fixed issue #292