Removed incompatibility with Java6