Proper fix for whole system