Fixed huge performance issue. back to normal speed again