Cleanest and simplest way that I can think of to fix problem.