One last LOGIC patch, for now