[fix] Re-apply #1 - Got lost in refactor