Fix needed for recursive call(see comments)