included patch from Tamer Rizk