Fixes crashing more pt 2