Fix: duplicate code