Fixes #298
Fixes #256