Christian, please review this change.  It was blowing up previously and I think the way I changed it is right.  But it's your magic, so let me know