Fixes #14