Fix Issue#19