Make detection of bug #749 a little more sophisticated