Added workaround for overlapping shuttles