Maybe we should keep this for compatibility reasons?