Fix for the issue with cases.completion