fix NPE
add override methode