Fixed Issue#9