Issue #3161 was fixed but tests are needed to be done.