Refactoring/issue#2255

#2255