Rewrote the static call to dynamic