(patch attached -- got lost somehow) Signed-off-by: Luben Tuikov