This may be a cleaner solution.  Thoughts?