Correct issue #414