I think this might fix the X bug...