Fixed system compatibility