Remove dynamic binding and circular reference - thanks @cjohansen!