Quick fix of the quick fix