Fix Issue#39