Fixed bugs in generic dot