Refactoring - fix save profile