Fix: for compatibility with the old system