actually fix this stack stuff