Look at the merge fix commit. I accidentally have rolled back somners' changes. I put it back.