diff --git a/src/common/mod.rs b/src/common/mod.rs
index af7474d..0801984 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -6,10 +6,6 @@ pub mod stack;
 pub const DEFAULT_MEMORY_INDEX: u32 = 0;
 /// Index of default table.
 pub const DEFAULT_TABLE_INDEX: u32 = 0;
-/// Maximum number of entries in value stack.
-pub const DEFAULT_VALUE_STACK_LIMIT: usize = 16384;
-/// Maximum number of entries in frame stack.
-pub const DEFAULT_FRAME_STACK_LIMIT: usize = 1024;
 
 /// Control stack frame.
 #[derive(Debug, Clone)]
diff --git a/src/runner.rs b/src/runner.rs
index b37055a..2b9d505 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -15,9 +15,13 @@ use value::{
 use host::Externals;
 use common::{DEFAULT_MEMORY_INDEX, DEFAULT_TABLE_INDEX, BlockFrame, BlockFrameType};
 use common::stack::StackWithLimit;
-use common::{DEFAULT_FRAME_STACK_LIMIT, DEFAULT_VALUE_STACK_LIMIT};
 use memory_units::Pages;
 
+/// Maximum number of entries in value stack.
+pub const DEFAULT_VALUE_STACK_LIMIT: usize = 16384;
+/// Maximum number of entries in frame stack.
+pub const DEFAULT_FRAME_STACK_LIMIT: usize = 16384;
+
 /// Function interpreter.
 pub struct Interpreter<'a, E: Externals + 'a> {
 	externals: &'a mut E,
diff --git a/src/validation/func.rs b/src/validation/func.rs
index aa6032c..29f7e14 100644
--- a/src/validation/func.rs
+++ b/src/validation/func.rs
@@ -10,10 +10,10 @@ use validation::Error;
 use common::stack::StackWithLimit;
 use common::{BlockFrame, BlockFrameType};
 
-/// Maximum number of entries in value stack.
+/// Maximum number of entries in value stack per function.
 const DEFAULT_VALUE_STACK_LIMIT: usize = 16384;
-/// Maximum number of entries in frame stack.
-const DEFAULT_FRAME_STACK_LIMIT: usize = 1024;
+/// Maximum number of entries in frame stack per function.
+const DEFAULT_FRAME_STACK_LIMIT: usize = 16384;
 
 /// Function validation context.
 struct FunctionValidationContext<'a> {