Issue fixed #1