Fix: add return in case statement