This fixes #16