Fixed Issue#22