fix same bug, add new feature Override