Edit Session fixed