Refactoring fixed and new problem solved