Fixe interface to be compat with RAET v0.0.20