Tr's fix