Fix Issue#40