GP first screen bug fix