Fixed overflowing right/down