Fix wrong behaviors
Border check