Added support for un-'px'ed values