Build fixed - solution temporary