BUG: Fixes #14