Fix of fix build