Fix: Do not repeat yourself