Fixed issue with broken session