This fixes #66