Fix for problem introduced by previous pull request (419)