Fix: resolve feedback from @beberlei