I've been trying to fix this issue for a bit myself. Good to know that I'm not the only one. Sucks that there's no fix.