restaure backward API compatibility