minor and potential bug fixed.