Bug fix(regression)