Fix stack overflow bug

Missing or was leaving stuff on stack...