Tweak restriction of scale_factors, closes #296 again