Issue #3 correction