Fixed regression issues