IP scaling: Fix #161 on the 1.2 branch (also related to #139)