Attempt to fix issue 633.