Fixed #210, Initial fix for performance issue on develop-2.0.0RC