Rescaling of axes should be better now