[PATCH] Naive fix for bug #208