have a look at c41786798b3eb2e4f318dc9d264931ed151c949c to see if it can help you narrow down the problem