Fixed issue with drawing headers