First attemp to repair build