applied cboltz's patch