This should be better backward compatible.