Missing return value fixed