This should be an actual fix to the bug