merge fix according to code style adaption