Checkstyle suppression fix