Fix #225 auto completion problem