This fixes #19