Issue fixed #36