Bug914

Fixes: #914