bug fix marging