bug fix and deploy