Better handling of routine clashing