Bug fixing. Can not generate contracts though