null content bug fix from bede gaming fork