bug fixed, feedback is applied.