bug fixed : nullPointerException