Fixed problem with auto rescaling