Fixed #210, Initial fix for performance issue on develop