Fix #217 improve skip completion behavior