Fix regression issue