Final fix (or is it?)