Temp fix for the title issue