Fix SKIP messages