Fix scaling, fix #18