Fixed issue #232