Merge in the update from arekk's fork that fixes the stack_to_deep problem