This is supposed to fix issue #471.

This is supposed to fix issue #471.