Correct issue #2