Partial fix for issue #232