Auto content bug fix