Restored quick fix (it had been removed accidentally when merging).