Residual bug fix
Residual bug fix