Fixed to work with Eclipse