Fix for reverse scales and NAs in limits