Re-added for Eclipse compatibility