adding patch for BFS 318 to 330