And now the commit with the actual files for the (#64) fix.

/me sighs