Complete fix