Solve Issue #195