Solve issue #114.