Bug780

Fixes: bug: #780