Fixed regression on theme merge