Fix to address https://bugs.eclipse.org/bugs/show_bug.cgi?id=437444#c181