Make my signature R16-compatible (no task)