Fixed the starts-with-B/F/M skipping issue