Closes #1 - fixed scale logic