Partial fix for issue #98