Fix completion problem