Fix problem in issue #2