Honestly, I personally think you just wrote about the best way to fix this in your post