Closes #1382.

Tp1382