Seems like a reasonable fix, but why was it getting called twice?