Fixed Issue#30