Hmm, looks like we're calling this method twice.. but that's existing behavior