Feature/82 profile fix