- Partial fix for issue #226