- By Benjamin fixed bug 2640, 2636 and 2635