fix Issue#61