Fixed and tested scale selection.