Introducing option to avoid scaling if value is 0 by default

Introducing option to avoid scaling if value is 0 by default #649