Removed stack level issue