Fixes: #3