apply zeripath's fix