Fix comment button being removed