[BUGFIX] now with the right scale support