Fix #225 improve disable completion