Fix Bug: 58ay can be out of window