Fix for HW errors