fixed potential ABI breakage