Issue fixed #5