some corrections to the quick fix