fixed contextListener