- fixed NullPointerException