This fixes #56