Fix code issue base on Dale feedback.