Partially fixed #25. BORDER_PX needs to be taken into account next.