Added another part for the user workaround