Fixed Issue#2.