You are a legend. I know you wrote this 6 years ago - but your Post just solved my exact same problem!