tntim96's patch