Fixes: #259
Fixes: #260