Refactoring - fix fail