Call stack wrong, fixed