Fix to be more specific and break less code.