Maybe Fixes #434. Seems to work here.