Hackfixing around a limitation in BFS.