bugfix + cstyle