Another attempt at fixing sizing