Fixed an issues, added func call.