Yeah, you are right. I have think I have fixed this issue, also I have reworked some parts of this class.