fixed some broken completion