Should fix Issue #732. Not reproduced, not tested