Properly fixed all now