Ugly quick fix for a bug