fix incoming bug correctly