Thanks to Zyx:
This patch should now (hopefully) fix my issue proberly and document it.