Fixed: nil ref refs #1437