Fix regression/bug