Fix: some wrong code must to be fixed!