Part 2 of workaround for Subclipse bug (?)