Fixes Heist ending immediately
Merge pull request #5503 from mwerezak/heist-fix

Fixes Heist ending immediately