Fixed Portal issue