Solve issue #120