Fixed problems with session and listener override