Bug fix

See description in the issue.

Thanks,
Eric.