Modify for issue #5