Use a separate function to keep backwards compatibility