Fixed listeners removal on view change