Another attempt for huroku compatability...