Add if then to avoid silliness