Temporary fix for cpu hanging