Minor patch (Issue #470)