Fixing missing return