bugfix : refactoring