Fixing of issue #5 has been started