Fix possible overflow when using /menu