fix bug
fix API
overriding