Fix Issue#24