Bug fix merged from master.