FIX: Working for variable scale factors