#4 bug fixed.