I'm not sure its worth going back to fix this, since this is a bandaid fix as we wait for subliminal to be ready in the coming weeks.