Fixed a conflict.. uhh.. again.