Bug fix for previous commit (lazy evaluation is essential here :-)