As far as I know this has been solved in 5.1, so just give it some time and you won’t have to worry about it anymore.