This seems totally unrelated to the rest of this pull request - in the future we should make sure we deal with individual topics separately.