Fix for Eclipse