Changed to naturalWidth/Height