Issue 2 : Fix for profile checking