Fix Issue#22