Merge pull request #3783 from maxonfjvipon/bug/#3481/rho-dot

Merge pull request #3783 from maxonfjvipon/bug/#3481/rho-dot #433