stash fix loop (wip)
infinite loops fixed \o/
Merge remote-tracking branch 'origin/inf_loop'