This fixes #25