temporal fix for bug #20