Fix for echodoc behavior