Fix X mis-behavior