fix potential NPE
add @Override annotation