fixed public API