Public Export function fix