Fixing stack overflow (and wrong method call)