Partial fix for issue #2