[BUG #8791] Use deltaX / deltaY when possible