Fixes post re-structure