fix #1 Performance issue fixed