Fix for SessionScoped