Partial fix for issue #5