Bugfix for Eclipse