Minor update
Added rebuild on failure