Source Update and bug fix.