Changes to preserve original stack trace
Made static value to a constant