Make it work in normal usecase