dev completed bug fix