brilliantservice's patch applied