Hot fix for gencompletion