Source update
Sharing fresh bug fix