Hopefully fixes issues with X as a var.