First push of bug fix to staging