removed possible NullPointerException