Fixed x enter leave bugs