Possibly fixed scaling issue