This fixes #18