Fix scaling better