Stackoverflow bug fix.