Better Complete support. Fix #143