Fix changing scales issue. close #5