Issue fixed: #5