Issue: #784