Fixing another issue towards #1063