Please, consider this patch (description and screenshots available).