Integrate diddleman/content fix