Fix for omni completion