Daniel, can you please try the attached patch and tell us if it fixes the 
issue without introducing regressions?