This fixes #46