Fixed (hopefully) xy scanning issues