Fixes #16