bug fix
Merge branch 'varun'