Consider attached patch (I've decided not to maintain pre-1.1.1 support).