Fixed handling of To