Session timeout fix