Special case handling added.