Fixed for eclipse