Fix for no-lookahead cs