fix mistake in final check
merge master