I also had this problem. I realize that it's been over 6 years since you posted op, but it really helped and I wanted to thank you. And you should mark this as solved.
Glad it helped. My last post above yours should be marked as the solution. (I can't mark my post as a solution.)