Fix for ecj