Eclipse issue persists... Working on a fix.