added a workaround / fix patch until i can submit a proper patch