Added workaround for error with the Profile API