Fixed bug, Minor improvement.