Fix #177 manual completion