Take a stab in the dark at #626

No clue, but it seems to fix #626