re #6992 fix attempt for style level, and a bug fix
re #6992 more style level fixes, and a bug fix