more special case handling