#6 correction checkstyle #5 correction bug