fixed buildAndWatch