recursive issue fixed