Make compatible with ahoi Tools v1.5