merged Tushar's bug fix with public repository changes