- resolved stack overflow bug