I actually fixed this issue in private messages with Qrim. Since this seems to be a more common issue than I thought, I'll release the changes as a public update.