We will have to look into this. I'm have not gone through this part of the code base in details yet.