Crappy but efficient way to solve a very nasty bug.

Fixes #412