Logo handling fixed