An easier way to fix your problem is to use Dara.Amaries templates. I use them in my stories, and they are super helpful