Fixed auto completeion