Please submit this one in a separate commit/pull request, it looks like a serious issue