Fix for heist?