Make compatible with RECAF