Rollbacked eclipse fix