Bug fix to master.