Fix bug reported by MQ.