Solve partially the issue #16