Fix for moonshot highlight