Redo this for backfill post too.
Merge pull request #138 from nZEDb/dev

Redo this for backfill post too.