Solve Issue#61.