Fix for #3354.

- Fixed #3375.
- Fixed #3377.