One additional fix for OS-X
Merge branch 'scaling_fixes' into iji_2