Adding export buffer to avoid potential micro timing issue