[Matahari] Replacement patch...