Fix Issue#26