Title bug changes from original repo