Fix double nested builds