Project issue #863.
- Re-added the code because lost somewhere?