Fixes: #61