Fix to prepare as eclipse project