#4 minor bug fixed