Basic completion issue fix...