Is this logic really needed?