Temporarily fixes #70