Fix potential export problem