Attempted fix of Mechanism conflict