Okay, that's a first, ugly fix
Cleaner (well, we do what we can) fix. Closes #639.