[FIX] Post WIP changes