Bug fixed. Speed increase.