Fix Issue#44