Fixed a conflict.