enhance check in clear optional tail