fixed xyz conflict